From b68554b14a14b82a2f905ab6f1ced913c88caa5c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 26 May 2019 23:22:47 -0400
Subject: [PATCH] spin button: Make final

---
 gtk/gtkspinbutton.c | 24 ++++++++++++++++++++++++
 gtk/gtkspinbutton.h | 38 --------------------------------------
 2 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index b038feb444..edad0b3a61 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -182,6 +182,30 @@
  * ]|
  */
 
+typedef struct _GtkSpinButton      GtkSpinButton;
+typedef struct _GtkSpinButtonClass GtkSpinButtonClass;
+
+struct _GtkSpinButton
+{
+  GtkWidget parent_instance;
+};
+
+struct _GtkSpinButtonClass
+{
+  GtkWidgetClass parent_class;
+
+  gint (*input)  (GtkSpinButton *spin_button,
+                  gdouble       *new_value);
+  gint (*output) (GtkSpinButton *spin_button);
+  void (*value_changed) (GtkSpinButton *spin_button);
+
+  /* Action signals for keybindings, do not connect to these */
+  void (*change_value) (GtkSpinButton *spin_button,
+                        GtkScrollType  scroll);
+
+  void (*wrapped) (GtkSpinButton *spin_button);
+};
+
 struct _GtkSpinButtonPrivate
 {
   GtkAdjustment *adjustment;
diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index d8457ab7ea..405fd6b5e9 100644
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -40,10 +40,7 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_SPIN_BUTTON                  (gtk_spin_button_get_type ())
 #define GTK_SPIN_BUTTON(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SPIN_BUTTON, GtkSpinButton))
-#define GTK_SPIN_BUTTON_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SPIN_BUTTON, GtkSpinButtonClass))
 #define GTK_IS_SPIN_BUTTON(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SPIN_BUTTON))
-#define GTK_IS_SPIN_BUTTON_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SPIN_BUTTON))
-#define GTK_SPIN_BUTTON_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SPIN_BUTTON, GtkSpinButtonClass))
 
 /**
  * GTK_INPUT_ERROR:
@@ -97,41 +94,6 @@ typedef enum
 
 
 typedef struct _GtkSpinButton              GtkSpinButton;
-typedef struct _GtkSpinButtonClass         GtkSpinButtonClass;
-
-/**
- * GtkSpinButton:
- *
- * The #GtkSpinButton-struct contains only private data and should
- * not be directly modified.
- */
-struct _GtkSpinButton
-{
-  GtkWidget parent_instance;
-};
-
-struct _GtkSpinButtonClass
-{
-  GtkWidgetClass parent_class;
-
-  gint (*input)  (GtkSpinButton *spin_button,
-		  gdouble       *new_value);
-  gint (*output) (GtkSpinButton *spin_button);
-  void (*value_changed) (GtkSpinButton *spin_button);
-
-  /* Action signals for keybindings, do not connect to these */
-  void (*change_value) (GtkSpinButton *spin_button,
-			GtkScrollType  scroll);
-
-  void (*wrapped) (GtkSpinButton *spin_button);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
 
 GDK_AVAILABLE_IN_ALL
 GType		gtk_spin_button_get_type	   (void) G_GNUC_CONST;
-- 
2.30.2